From 9126c398c00d851bd57697f13452e731d769291f Mon Sep 17 00:00:00 2001
From: jfatherton <jfatherton@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sat, 4 Sep 2004 02:20:23 +0000
Subject: [PATCH] Fixed user defaults for OS X 10.3

---
 .../English.lproj/MainMenu.nib/info.nib       |   10 +-
 .../English.lproj/MainMenu.nib/objects.nib    |  Bin 22255 -> 22015 bytes
 gpsbabel/macgpsbabel/MacGPSBabel.applescript  |   54 +-
 .../MacGPSBabel.pbproj/jeremya.pbxuser        | 1774 +++--------------
 .../MacGPSBabel.pbproj/project.pbxproj        |   67 +-
 gpsbabel/macgpsbabel/preferences.applescript  |   71 +-
 6 files changed, 367 insertions(+), 1609 deletions(-)

diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
index 035a88d62..0f6ae32f9 100644
--- a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
+++ b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
@@ -2,22 +2,24 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>IBDocumentLocation</key>
+	<string>69 10 356 240 0 0 1152 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
 		<string>69 252 302 44 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>291.0</string>
+	<string>364.0</string>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>305</integer>
 		<integer>229</integer>
 		<integer>21</integer>
-		<integer>29</integer>
-		<integer>305</integer>
 		<integer>678</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>6R73</string>
+	<string>7M34</string>
 </dict>
 </plist>
diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib
index bd6af5e3968fa3bb95323f05f21020144a36668e..92e08d284a77bdadf4f0ff7af0b236f7215d07e7 100644
GIT binary patch
literal 22015
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
KU3irvo&Imsj|yG@

literal 22255
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

diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.applescript b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
index c7d352a2c..10ac11e53 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.applescript
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
@@ -1,7 +1,7 @@
 -- MacGPSBabel: MacGPSBabel.applescript
 
 --  File created by Jeremy Atherton on Sunday, September 28, 2003.
---  Last modified by Jeremy Atherton on Monday, February 16, 2004.
+--  Last modified by Jeremy Atherton on Thursday, September 2, 2004.
 
 --  MacGPSBabel is part of the gpsbabel project and is Copyright (c) 2004 Robert Lipe.
 -- see http://gpsbabel.sourceforge.net/ for more details
@@ -14,25 +14,17 @@ global theFiles, typeList, extList, aFile
 
 -- Start up scripts
 -- get supported file types from gpsbabel and use these to populate the file types popup lists
-on awake from nib theObject
-	if theObject is window "MacGPSBabel" then
-		tell window "MacGPSBabel"
-			set popList to my getFormats()
-			repeat with i in popList
-				make new menu item at the end of menu items of menu of popup button "inPop" with properties {title:i, enabled:true}
-				make new menu item at the end of menu items of menu of popup button "outPop" with properties {title:i, enabled:true}
-			end repeat
-		end tell
-	end if
-end awake from nib
--- set the progress indicator style
-on will open theObject
-	if theObject is window "MacGPSBabel" then
-		set p to progress indicator 1 of theObject
-		call method "setStyle:" of p with parameter 1
-		call method "setDisplayedWhenStopped:" of p with parameters {false}
-	end if
-end will open
+-- on awake from nib theObject
+--	if theObject is window "MacGPSBabel" then
+--		tell window "MacGPSBabel"
+--			set popList to my getFormats()
+--			repeat with i in popList
+--				make new menu item at the end of menu items of menu of popup button "inPop" with properties {title:i, enabled:true}
+--				make new menu item at the end of menu items of menu of popup button "outPop" with properties {title:i, enabled:true}
+--			end repeat
+--		end tell
+--	end if
+-- end awake from nib
 
 -- handler for the File>Open menu item
 on choose menu item theObject
@@ -577,28 +569,6 @@ on applyFilters()
 	return filterText
 end applyFilters
 
--- handler (called at startup) to check with GPS Babel which file formats it can handle. Return the result as a list
-on getFormats()
-	set myList to {}
-	set typeList to {}
-	set extList to {}
-	set thePath to POSIX path of (path to me) as string
-	set scriptOut to (do shell script quoted form of thePath & "Contents/Resources/gpsbabel -^1") as string
-	set theCount to count of paragraphs in scriptOut
-	set defaultDelimiters to AppleScript's text item delimiters
-	set AppleScript's text item delimiters to tab
-	repeat with i from 1 to theCount
-		set theLine to paragraph i of scriptOut
-		if (first text item of theLine) is equal to "file" then
-			set the end of typeList to the second text item of theLine
-			set the end of extList to the third text item of theLine
-			set the end of myList to the last text item of theLine
-		end if
-	end repeat
-	set AppleScript's text item delimiters to defaultDelimiters
-	return myList
-end getFormats
-
 -- handlers to deal with the GPS receiver checkboxes
 on GPSSwitchIN()
 	if state of button "GPSswitchIN" of window "MacGPSBabel" = 1 then
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
index 3fbd8573f..4411a0c1c 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
@@ -9,274 +9,217 @@
 		);
 		breakpoints = (
 		);
+		codeSenseManager = 3F8AAF0906E7E5D400E74F19;
 		executables = (
 			DA206CF0015C4D9F03C91932,
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 114188516;
-			"PBXTemplateGeometry-F5314676015831810DCA290F" = {
-				ContentSize = "{685, 434}";
-				LeftSlideOut = {
-					Collapsed = NO;
-					Frame = "{{0, 23}, {685, 411}}";
-					Split0 = {
-						ActiveTab = 2;
-						ActiveTabName = PBXBuildResultsModule;
-						Collapsed = NO;
-						Frame = "{{0, 0}, {685, 411}}";
-						Split0 = {
-							Frame = "{{0, 301}, {685, 110}}";
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {952, 321}}";
-						};
-						Tab1 = {
-							Debugger = {
-								Collapsed = NO;
-								Frame = "{{0, 0}, {781, 452}}";
-								Split0 = {
-									Frame = "{{0, 24}, {781, 428}}";
-									Split0 = {
-										Frame = "{{0, 0}, {383, 428}}";
-									};
-									Split1 = {
-										DebugVariablesTableConfiguration = (
-											Name,
-											123,
-											Value,
-											85,
-											Summary,
-											155.123,
-										);
-										Frame = "{{392, 0}, {389, 428}}";
-									};
-									SplitCount = 2;
-								};
-								SplitCount = 1;
-								Tab0 = {
-									Frame = "{{0, 0}, {100, 50}}";
-								};
-								Tab1 = {
-									Frame = "{{0, 0}, {100, 50}}";
-								};
-								TabCount = 2;
-								TabsVisible = YES;
-							};
-							Frame = "{{0, 0}, {781, 452}}";
-							LauncherConfigVersion = 7;
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {685, 215}}";
-							LauncherConfigVersion = 3;
-							Runner = {
-								Frame = "{{0, 0}, {685, 215}}";
-							};
-						};
-						Tab3 = {
-							BuildMessageFrame = "{{0, 0}, {687, 262}}";
-							BuildTranscriptFrame = "{{0, 271}, {687, 2}}";
-							BuildTranscriptFrameExpanded = YES;
-							Frame = "{{0, 0}, {685, 295}}";
-						};
-						Tab4 = {
-							Frame = "{{0, 0}, {612, 295}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
+			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					242,
+					20,
+					48,
+					43,
+					43,
+					20,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+					PBXFileDataSource_Target_ColumnID,
+				);
+			};
+			PBXPerProjectTemplateStateSaveDate = 115952475;
+			PBXPrepackagedSmartGroups_v2 = (
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					activationKey = OldTargetSmartGroup;
+					clz = PBXTargetSmartGroup;
+					description = "Displays all targets of the project.";
+					globalID = 1C37FABC04509CD000000102;
+					name = Targets;
+					preferences = {
+						image = Targets;
 					};
-					SplitCount = 1;
-					Tab0 = {
-						Frame = "{{0, 0}, {300, 533}}";
-						GroupTreeTableConfiguration = (
-							TargetStatusColumn,
-							18,
-							MainColumn,
-							267,
-						);
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXTargetSmartGroup2;
+					description = "Displays all targets of the project as well as nested build phases.";
+					globalID = 1C37FBAC04509CD000000102;
+					name = Targets;
+					preferences = {
+						image = Targets;
 					};
-					Tab1 = {
-						ClassesFrame = "{{0, 0}, {280, 398}}";
-						ClassesTreeTableConfiguration = (
-							PBXBookColumnIdentifier,
-							20,
-							PBXClassColumnIdentifier,
-							237,
-						);
-						Frame = "{{0, 0}, {278, 659}}";
-						MembersFrame = "{{0, 407}, {280, 252}}";
-						MembersTreeTableConfiguration = (
-							PBXBookColumnIdentifier,
-							20,
-							PBXMethodColumnIdentifier,
-							236,
-						);
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXExecutablesSmartGroup;
+					description = "Displays all executables of the project.";
+					globalID = 1C37FAAC04509CD000000102;
+					name = Executables;
+					preferences = {
+						image = Executable;
 					};
-					Tab2 = {
-						Frame = "{{0, 0}, {200, 100}}";
+				},
+				{
+					" PBXTransientLocationAtTop " = bottom;
+					absolutePathToBundle = "";
+					clz = PBXErrorsWarningsSmartGroup;
+					description = "Displays files with errors or warnings.";
+					globalID = 1C08E77C0454961000C914BD;
+					name = "Errors and Warnings";
+					preferences = {
+						fnmatch = "";
+						image = WarningsErrors;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
 					};
-					Tab3 = {
-						Frame = "{{0, 0}, {200, 100}}";
-						TargetTableConfiguration = (
-							ActiveObject,
-							16,
-							ObjectNames,
-							202.296,
-						);
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = 1CC0EA4004350EF90044410B;
+					name = "Implementation Files";
+					preferences = {
+						canSave = 1;
+						fnmatch = "";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "?*\\.[mcMC]";
+						root = "<PROJECT>";
 					};
-					Tab4 = {
-						BreakpointsTreeTableConfiguration = (
-							breakpointColumn,
-							197,
-							enabledColumn,
-							31,
-						);
-						Frame = "{{0, 0}, {250, 100}}";
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "This group displays Interface Builder NIB Files.";
+					globalID = 1CC0EA4004350EF90041110B;
+					name = "NIB Files";
+					preferences = {
+						canSave = 1;
+						fnmatch = "*.nib";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
 					};
-					TabCount = 5;
-					TabsVisible = NO;
-				};
-				NavBarShownByDefault = YES;
-				StatusViewVisible = YES;
-				Template = F5314676015831810DCA290F;
-				ToolbarVisible = YES;
-				WindowLocation = "{7, 250}";
-			};
-			"PBXTemplateGeometry-F5534CB2020F3F8A0DCA290F" = {
-				ContentSize = "{594, 303}";
-				LeftSlideOut = {
-					Collapsed = NO;
-					Frame = "{{0, 23}, {594, 280}}";
-					Split0 = {
-						ActiveTab = 1;
-						ActiveTabName = PBXRunSessionModule;
-						Collapsed = YES;
-						Frame = "{{0, 0}, {594, 280}}";
-						Split0 = {
-							Frame = "{{1e+06, 1e+06}, {594, 0}}";
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {804, 321}}";
-						};
-						Tab1 = {
-							Debugger = {
-								Collapsed = NO;
-								Frame = "{{0, 0}, {594, 274}}";
-								Split0 = {
-									Frame = "{{0, 24}, {594, 250}}";
-									Split0 = {
-										Frame = "{{0, 0}, {290, 250}}";
-									};
-									Split1 = {
-										DebugVariablesTableConfiguration = (
-											Name,
-											123,
-											Value,
-											85,
-											Summary,
-											62.123,
-										);
-										Frame = "{{299, 0}, {295, 250}}";
-									};
-									SplitCount = 2;
-								};
-								SplitCount = 1;
-								Tab0 = {
-									Frame = "{{0, 0}, {100, 50}}";
-								};
-								Tab1 = {
-									Frame = "{{0, 0}, {100, 50}}";
-								};
-								TabCount = 2;
-								TabsVisible = YES;
-							};
-							Frame = "{{0, 0}, {594, 274}}";
-							LauncherConfigVersion = 7;
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {594, 274}}";
-							LauncherConfigVersion = 3;
-							Runner = {
-								Frame = "{{0, 0}, {594, 274}}";
-							};
-						};
-						Tab3 = {
-							BuildMessageFrame = "{{0, 0}, {614, 262}}";
-							BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
-							BuildTranscriptFrameExpanded = YES;
-							Frame = "{{0, 0}, {612, 295}}";
-						};
-						Tab4 = {
-							Frame = "{{0, 0}, {612, 295}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
+				},
+				{
+					PBXTransientLocationAtTop = no;
+					absolutePathToBundle = "";
+					clz = PBXFindSmartGroup;
+					description = "Displays Find Results.";
+					globalID = 1C37FABC05509CD000000102;
+					name = "Find Results";
+					preferences = {
+						image = spyglass;
 					};
-					SplitCount = 1;
-					Tab0 = {
-						Frame = "{{0, 0}, {300, 533}}";
-						GroupTreeTableConfiguration = (
-							TargetStatusColumn,
-							18,
-							MainColumn,
-							267,
-						);
+				},
+				{
+					PBXTransientLocationAtTop = no;
+					absolutePathToBundle = "";
+					clz = PBXBookmarksSmartGroup;
+					description = "Displays Project Bookmarks.";
+					globalID = 1C37FABC05539CD112110102;
+					name = Bookmarks;
+					preferences = {
+						image = Bookmarks;
 					};
-					Tab1 = {
-						ClassesFrame = "{{0, 0}, {280, 398}}";
-						ClassesTreeTableConfiguration = (
-							PBXBookColumnIdentifier,
-							20,
-							PBXClassColumnIdentifier,
-							237,
-						);
-						Frame = "{{0, 0}, {278, 659}}";
-						MembersFrame = "{{0, 407}, {280, 252}}";
-						MembersTreeTableConfiguration = (
-							PBXBookColumnIdentifier,
-							20,
-							PBXMethodColumnIdentifier,
-							236,
-						);
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = XCSCMSmartGroup;
+					description = "Displays files with interesting SCM status.";
+					globalID = E2644B35053B69B200211256;
+					name = SCM;
+					preferences = {
+						image = PBXRepository;
+						isLeaf = 0;
 					};
-					Tab2 = {
-						Frame = "{{0, 0}, {200, 100}}";
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXSymbolsSmartGroup;
+					description = "Displays all symbols for the project.";
+					globalID = 1C37FABC04509CD000100104;
+					name = "Project Symbols";
+					preferences = {
+						image = ProjectSymbols;
+						isLeaf = 1;
 					};
-					Tab3 = {
-						Frame = "{{0, 0}, {200, 386}}";
-						TargetTableConfiguration = (
-							ActiveObject,
-							16,
-							ObjectNames,
-							202.296,
-						);
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = PBXTemplateMarker;
+					name = "Simple Filter SmartGroup";
+					preferences = {
+						canSave = 1;
+						fnmatch = "*.nib";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
 					};
-					Tab4 = {
-						BreakpointsTreeTableConfiguration = (
-							breakpointColumn,
-							197,
-							enabledColumn,
-							31,
-						);
-						Frame = "{{0, 0}, {250, 386}}";
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = PBXTemplateMarker;
+					name = "Simple Regular Expression SmartGroup";
+					preferences = {
+						canSave = 1;
+						fnmatch = "";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "?*\\.[mcMC]";
+						root = "<PROJECT>";
 					};
-					TabCount = 5;
-					TabsVisible = NO;
-				};
-				NavBarShownByDefault = YES;
-				StatusViewVisible = YES;
-				Template = F5534CB2020F3F8A0DCA290F;
-				ToolbarVisible = YES;
-				WindowLocation = "{4, 381}";
-			};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					clz = XDDesignSmartGroup;
+					description = "Displays Xdesign models";
+					globalID = 2E4A936305E6979E00701470;
+					name = Design;
+					preferences = {
+						image = Design;
+						isLeaf = 0;
+					};
+				},
+			);
 			PBXWorkspaceContents = (
 				{
 					LeftSlideOut = {
 						Split0 = {
 							Split0 = {
 								NavContent0 = {
-									bookmark = 3F6587EF06CE7003007C6F9A;
+									bookmark = 3F89A6FF06D5B1F6007C6F9A;
 									history = (
 										F5E2D67E05CDA550017C67C1,
 										F5E2D67F05CDA550017C67C1,
@@ -284,9 +227,9 @@
 										F5EAB15305FF78D401A80065,
 										3F7037A606B335A800A80064,
 										3F7037A706B335A800A80064,
-										3F10FD0506CC4D6D00A80064,
-										3F10FD0606CC4D6D00A80064,
-										3F6587EE06CE7003007C6F9A,
+										3F89A6F906D5B1F6007C6F9A,
+										3F89A6FA06D5B1F6007C6F9A,
+										3F89A6FB06D5B1F6007C6F9A,
 									);
 									prevStack = (
 										F5F16EF80527D1B401A80064,
@@ -406,6 +349,10 @@
 										3F10FD0A06CC4D6D00A80064,
 										3F10FD0B06CC4D6D00A80064,
 										3F10FD0C06CC4D6D00A80064,
+										3FC9F73A06CEA744007C6F9A,
+										3F89A6FC06D5B1F6007C6F9A,
+										3F89A6FD06D5B1F6007C6F9A,
+										3F89A6FE06D5B1F6007C6F9A,
 									);
 								};
 								NavCount = 1;
@@ -783,7 +730,7 @@
 							Collapsed = YES;
 							Frame = "{{0, 0}, {594, 280}}";
 							Split0 = {
-								Frame = "{{1e+06, 1e+06}, {594, 0}}";
+								Frame = "{{1e+06, 1e+06}, {594, 27}}";
 							};
 							SplitCount = 1;
 							Tab0 = {
@@ -901,141 +848,11 @@
 					WindowLocation = "{4, 381}";
 				},
 			);
-			PBXWorkspaceStateSaveDate = 114188516;
+			PBXWorkspaceStateSaveDate = 115952475;
 		};
-		perUserProjectItems = {
-			3F0A602B062B681C007C67C1 = 3F0A602B062B681C007C67C1;
-			3F0A602C062B681C007C67C1 = 3F0A602C062B681C007C67C1;
-			3F0A602D062B681C007C67C1 = 3F0A602D062B681C007C67C1;
-			3F0BDAD706AF6C1F00A80064 = 3F0BDAD706AF6C1F00A80064;
-			3F10FD0506CC4D6D00A80064 = 3F10FD0506CC4D6D00A80064;
-			3F10FD0606CC4D6D00A80064 = 3F10FD0606CC4D6D00A80064;
-			3F10FD0806CC4D6D00A80064 = 3F10FD0806CC4D6D00A80064;
-			3F10FD0906CC4D6D00A80064 = 3F10FD0906CC4D6D00A80064;
-			3F10FD0A06CC4D6D00A80064 = 3F10FD0A06CC4D6D00A80064;
-			3F10FD0B06CC4D6D00A80064 = 3F10FD0B06CC4D6D00A80064;
-			3F10FD0C06CC4D6D00A80064 = 3F10FD0C06CC4D6D00A80064;
-			3F2FDB0806B4943500A80064 = 3F2FDB0806B4943500A80064;
-			3F579AB40645EEDF007C6F93 = 3F579AB40645EEDF007C6F93;
-			3F579AB50645EEDF007C6F93 = 3F579AB50645EEDF007C6F93;
-			3F5F093C06B4953400A80064 = 3F5F093C06B4953400A80064;
-			3F6587EE06CE7003007C6F9A = 3F6587EE06CE7003007C6F9A;
-			3F6587EF06CE7003007C6F9A = 3F6587EF06CE7003007C6F9A;
-			3F7037A606B335A800A80064 = 3F7037A606B335A800A80064;
-			3F7037A706B335A800A80064 = 3F7037A706B335A800A80064;
-			3F7037A806B335A800A80064 = 3F7037A806B335A800A80064;
-			3F7037A906B335A800A80064 = 3F7037A906B335A800A80064;
-			3F7037AA06B335A800A80064 = 3F7037AA06B335A800A80064;
-			3F7037AB06B335A800A80064 = 3F7037AB06B335A800A80064;
-			3F9319E906AF4FA500A80064 = 3F9319E906AF4FA500A80064;
-			3F9319EA06AF4FA500A80064 = 3F9319EA06AF4FA500A80064;
-			3F9319EB06AF4FA500A80064 = 3F9319EB06AF4FA500A80064;
-			3FB94844069C744B00A80064 = 3FB94844069C744B00A80064;
-			3FB94845069C744B00A80064 = 3FB94845069C744B00A80064;
-			3FB94846069C744B00A80064 = 3FB94846069C744B00A80064;
-			3FB94847069C744B00A80064 = 3FB94847069C744B00A80064;
-			3FB94848069C744B00A80064 = 3FB94848069C744B00A80064;
-			3FB94849069C744B00A80064 = 3FB94849069C744B00A80064;
-			F505F8000617AE8001A80065 = F505F8000617AE8001A80065;
-			F505F8010617AE8001A80065 = F505F8010617AE8001A80065;
-			F505F8020617AE8001A80065 = F505F8020617AE8001A80065;
-			F508F40305A7AE8A01A80064 = F508F40305A7AE8A01A80064;
-			F508F40405A7AE8A01A80064 = F508F40405A7AE8A01A80064;
-			F508F40505A7AE8A01A80064 = F508F40505A7AE8A01A80064;
-			F50EB4AF05CB231C017C67C1 = F50EB4AF05CB231C017C67C1;
-			F51C069F05C4C5B4017C67C1 = F51C069F05C4C5B4017C67C1;
-			F51C06A005C4C5B4017C67C1 = F51C06A005C4C5B4017C67C1;
-			F51C06A105C4C5B4017C67C1 = F51C06A105C4C5B4017C67C1;
-			F51CF6B405AF9E8901A80064 = F51CF6B405AF9E8901A80064;
-			F523D7AD05CB3DB9017C67C1 = F523D7AD05CB3DB9017C67C1;
-			F523D7AE05CB3DB9017C67C1 = F523D7AE05CB3DB9017C67C1;
-			F52B871705A8A05001A80064 = F52B871705A8A05001A80064;
-			F52B871905A8A05001A80064 = F52B871905A8A05001A80064;
-			F52B871B05A8A05001A80064 = F52B871B05A8A05001A80064;
-			F52E6CB905995A8001A80064 = F52E6CB905995A8001A80064;
-			F52E6CBA05995A8001A80064 = F52E6CBA05995A8001A80064;
-			F52E6CBB05995A8001A80064 = F52E6CBB05995A8001A80064;
-			F52E6CBC05995A8001A80064 = F52E6CBC05995A8001A80064;
-			F52E6CBD05995A8001A80064 = F52E6CBD05995A8001A80064;
-			F52E6CBE05995A8001A80064 = F52E6CBE05995A8001A80064;
-			F53C482A061A912901A80065 = F53C482A061A912901A80065;
-			F53C482B061A912901A80065 = F53C482B061A912901A80065;
-			F54D1E350548BAC0017C67C1 = F54D1E350548BAC0017C67C1;
-			F54D1E360548BAC0017C67C1 = F54D1E360548BAC0017C67C1;
-			F54D1E370548BAC0017C67C1 = F54D1E370548BAC0017C67C1;
-			F5516AA205E1AD5A017C67C1 = F5516AA205E1AD5A017C67C1;
-			F5516AA305E1AD5A017C67C1 = F5516AA305E1AD5A017C67C1;
-			F5516AA405E1AD5A017C67C1 = F5516AA405E1AD5A017C67C1;
-			F5516AA505E1AD5A017C67C1 = F5516AA505E1AD5A017C67C1;
-			F5516AA605E1AD5A017C67C1 = F5516AA605E1AD5A017C67C1;
-			F5516AA705E1AD5A017C67C1 = F5516AA705E1AD5A017C67C1;
-			F5516AA805E1AD5A017C67C1 = F5516AA805E1AD5A017C67C1;
-			F5516AA905E1AD5A017C67C1 = F5516AA905E1AD5A017C67C1;
-			F5516AAA05E1AD5A017C67C1 = F5516AAA05E1AD5A017C67C1;
-			F5516AAB05E1AD5A017C67C1 = F5516AAB05E1AD5A017C67C1;
-			F5516AAC05E1AD5A017C67C1 = F5516AAC05E1AD5A017C67C1;
-			F554DF6805AE715801A80064 = F554DF6805AE715801A80064;
-			F554DF6905AE715801A80064 = F554DF6905AE715801A80064;
-			F554DF6A05AE715801A80064 = F554DF6A05AE715801A80064;
-			F554DF6B05AE715801A80064 = F554DF6B05AE715801A80064;
-			F557060805C8B0C0017C67C1 = F557060805C8B0C0017C67C1;
-			F557060905C8B0C0017C67C1 = F557060905C8B0C0017C67C1;
-			F557060A05C8B0C0017C67C1 = F557060A05C8B0C0017C67C1;
-			F557060B05C8B0C0017C67C1 = F557060B05C8B0C0017C67C1;
-			F557060C05C8B0C0017C67C1 = F557060C05C8B0C0017C67C1;
-			F586ED0705CC1ED5017C67C1 = F586ED0705CC1ED5017C67C1;
-			F586ED0805CC1ED5017C67C1 = F586ED0805CC1ED5017C67C1;
-			F586ED0905CC1ED5017C67C1 = F586ED0905CC1ED5017C67C1;
-			F586ED0A05CC1ED5017C67C1 = F586ED0A05CC1ED5017C67C1;
-			F586ED0B05CC1ED5017C67C1 = F586ED0B05CC1ED5017C67C1;
-			F586ED0C05CC1ED5017C67C1 = F586ED0C05CC1ED5017C67C1;
-			F586ED0D05CC1ED5017C67C1 = F586ED0D05CC1ED5017C67C1;
-			F586ED0E05CC1ED5017C67C1 = F586ED0E05CC1ED5017C67C1;
-			F586ED0F05CC1ED5017C67C1 = F586ED0F05CC1ED5017C67C1;
-			F586ED1005CC1ED5017C67C1 = F586ED1005CC1ED5017C67C1;
-			F586ED1105CC1ED5017C67C1 = F586ED1105CC1ED5017C67C1;
-			F586ED1205CC1ED5017C67C1 = F586ED1205CC1ED5017C67C1;
-			F586ED1305CC1ED5017C67C1 = F586ED1305CC1ED5017C67C1;
-			F586ED1405CC1ED5017C67C1 = F586ED1405CC1ED5017C67C1;
-			F588B18805DF3294017C67C1 = F588B18805DF3294017C67C1;
-			F58F331C05CF5079017C67C1 = F58F331C05CF5079017C67C1;
-			F58F331D05CF5079017C67C1 = F58F331D05CF5079017C67C1;
-			F58F331E05CF5079017C67C1 = F58F331E05CF5079017C67C1;
-			F58F331F05CF5079017C67C1 = F58F331F05CF5079017C67C1;
-			F58F332005CF5079017C67C1 = F58F332005CF5079017C67C1;
-			F58F332105CF5079017C67C1 = F58F332105CF5079017C67C1;
-			F58F332205CF5079017C67C1 = F58F332205CF5079017C67C1;
-			F58F332305CF5079017C67C1 = F58F332305CF5079017C67C1;
-			F58F332405CF5079017C67C1 = F58F332405CF5079017C67C1;
-			F58F332505CF5079017C67C1 = F58F332505CF5079017C67C1;
-			F5CCE1EA05CCCE05017C67C1 = F5CCE1EA05CCCE05017C67C1;
-			F5CCE1EB05CCCE05017C67C1 = F5CCE1EB05CCCE05017C67C1;
-			F5D9F70F05CF63CD017C67C1 = F5D9F70F05CF63CD017C67C1;
-			F5DC7AAE05D47E10017C67C1 = F5DC7AAE05D47E10017C67C1;
-			F5DC7AB305D49339017C67C1 = F5DC7AB305D49339017C67C1;
-			F5DC7AB405D49339017C67C1 = F5DC7AB405D49339017C67C1;
-			F5DC7AB805D495EE017C67C1 = F5DC7AB805D495EE017C67C1;
-			F5E2D67E05CDA550017C67C1 = F5E2D67E05CDA550017C67C1;
-			F5E2D67F05CDA550017C67C1 = F5E2D67F05CDA550017C67C1;
-			F5E2D68005CDA550017C67C1 = F5E2D68005CDA550017C67C1;
-			F5E2D68205CDA550017C67C1 = F5E2D68205CDA550017C67C1;
-			F5E2D68305CDA550017C67C1 = F5E2D68305CDA550017C67C1;
-			F5E2D68405CDA550017C67C1 = F5E2D68405CDA550017C67C1;
-			F5E2D68505CDA550017C67C1 = F5E2D68505CDA550017C67C1;
-			F5E2D68605CDA550017C67C1 = F5E2D68605CDA550017C67C1;
-			F5E67E8505DFEBAB017C67C1 = F5E67E8505DFEBAB017C67C1;
-			F5E67E8605DFEBAB017C67C1 = F5E67E8605DFEBAB017C67C1;
-			F5EAB15305FF78D401A80065 = F5EAB15305FF78D401A80065;
-			F5EAB15505FF78D401A80065 = F5EAB15505FF78D401A80065;
-			F5EAB15605FF78D401A80065 = F5EAB15605FF78D401A80065;
-			F5F16EF80527D1B401A80064 = F5F16EF80527D1B401A80064;
-			F5F2761005EDB91901A80065 = F5F2761005EDB91901A80065;
-			F5F411C805EEF803017C67C1 = F5F411C805EEF803017C67C1;
+		sourceControlManager = 3F8AAF0806E7E5D400E74F19;
+		userBuildSettings = {
 		};
-		projectwideBuildSettings = {
-		};
-		wantsIndex = 1;
-		wantsSCM = -1;
 	};
 	29B97326FDCFA39411CA2CEA = {
 		activeExec = 0;
@@ -1043,295 +860,27 @@
 			DA206CF0015C4D9F03C91932,
 		);
 	};
-	3F0A602B062B681C007C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 145";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 1874;
-		vrLoc = 4192;
-	};
-	3F0A602C062B681C007C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 5";
-		rLen = 0;
-		rLoc = 209;
-		rType = 0;
-		vrLen = 281;
-		vrLoc = 0;
-	};
-	3F0A602D062B681C007C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	3F0BDAD706AF6C1F00A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 301";
-		rLen = 0;
-		rLoc = 14214;
-		rType = 0;
-		vrLen = 1839;
-		vrLoc = 0;
-	};
-	3F10FD0506CC4D6D00A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	3F10FD0606CC4D6D00A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 144";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2066;
-		vrLoc = 40;
-	};
-	3F10FD0806CC4D6D00A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	3F10FD0906CC4D6D00A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 301";
-		rLen = 0;
-		rLoc = 14214;
-		rType = 0;
-		vrLen = 1839;
-		vrLoc = 0;
-	};
-	3F10FD0A06CC4D6D00A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 144";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2106;
-		vrLoc = 40;
-	};
-	3F10FD0B06CC4D6D00A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 301";
-		rLen = 0;
-		rLoc = 14214;
-		rType = 0;
-		vrLen = 1839;
-		vrLoc = 0;
-	};
-	3F10FD0C06CC4D6D00A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 144";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2066;
-		vrLoc = 40;
-	};
-	3F2FDB0806B4943500A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	3F579AB40645EEDF007C6F93 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 426";
-		rLen = 0;
-		rLoc = 20376;
-		rType = 0;
-		vrLen = 1839;
-		vrLoc = 0;
-	};
-	3F579AB50645EEDF007C6F93 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 5";
-		rLen = 0;
-		rLoc = 209;
-		rType = 0;
-		vrLen = 281;
-		vrLoc = 0;
-	};
-	3F5F093C06B4953400A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 144";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 1949;
-		vrLoc = 4117;
-	};
-	3F6587EE06CE7003007C6F9A = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 23";
-		rLen = 0;
-		rLoc = 838;
-		rType = 0;
-		vrLen = 1839;
-		vrLoc = 0;
-	};
-	3F6587EF06CE7003007C6F9A = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 654";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1669;
-		vrLoc = 18774;
-	};
-	3F7037A606B335A800A80064 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 5";
-		rLen = 0;
-		rLoc = 209;
-		rType = 0;
-		vrLen = 307;
-		vrLoc = 0;
-	};
-	3F7037A706B335A800A80064 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 21";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 1414;
-		vrLoc = 0;
-	};
-	3F7037A806B335A800A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 122";
-		rLen = 0;
-		rLoc = 5321;
-		rType = 0;
-		vrLen = 2099;
-		vrLoc = 607;
-	};
-	3F7037A906B335A800A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 301";
-		rLen = 0;
-		rLoc = 14214;
-		rType = 0;
-		vrLen = 1634;
-		vrLoc = 12662;
-	};
-	3F7037AA06B335A800A80064 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 5";
-		rLen = 0;
-		rLoc = 209;
-		rType = 0;
-		vrLen = 307;
-		vrLoc = 0;
-	};
-	3F7037AB06B335A800A80064 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 21";
-		rLen = 0;
-		rLoc = 1317;
-		rType = 0;
-		vrLen = 1414;
-		vrLoc = 0;
-	};
-	3F9319E906AF4FA500A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 122";
-		rLen = 0;
-		rLoc = 5321;
-		rType = 0;
-		vrLen = 1874;
-		vrLoc = 4192;
-	};
-	3F9319EA06AF4FA500A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 426";
-		rLen = 0;
-		rLoc = 20376;
-		rType = 0;
-		vrLen = 1594;
-		vrLoc = 15551;
-	};
-	3F9319EB06AF4FA500A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 122";
-		rLen = 0;
-		rLoc = 5321;
-		rType = 0;
-		vrLen = 2103;
-		vrLoc = 0;
-	};
-	3FB94844069C744B00A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	3FB94845069C744B00A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 426";
-		rLen = 0;
-		rLoc = 20376;
-		rType = 0;
-		vrLen = 1839;
-		vrLoc = 0;
-	};
-	3FB94846069C744B00A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 145";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 1874;
-		vrLoc = 4192;
-	};
-	3FB94847069C744B00A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 426";
-		rLen = 0;
-		rLoc = 20376;
-		rType = 0;
-		vrLen = 1955;
-		vrLoc = 350;
-	};
-	3FB94848069C744B00A80064 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 145";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 1874;
-		vrLoc = 4192;
-	};
-	3FB94849069C744B00A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 426";
-		rLen = 0;
-		rLoc = 20376;
-		rType = 0;
-		vrLen = 1594;
-		vrLoc = 15551;
+	3F8AAF0806E7E5D400E74F19 = {
+		fallbackIsa = XCSourceControlManager;
+		isSCMEnabled = 0;
+		isa = PBXSourceControlManager;
+		scmConfiguration = {
+		};
+		scmType = "";
+	};
+	3F8AAF0906E7E5D400E74F19 = {
+		indexTemplatePath = "";
+		isa = PBXCodeSenseManager;
+		usesDefaults = 1;
+		wantsCodeCompletion = 1;
+		wantsCodeCompletionAutoSuggestions = 0;
+		wantsCodeCompletionCaseSensitivity = 1;
+		wantsCodeCompletionListAlways = 1;
+		wantsCodeCompletionOnlyMatchingItems = 1;
+		wantsCodeCompletionParametersIncluded = 1;
+		wantsCodeCompletionPlaceholdersInserted = 1;
+		wantsCodeCompletionTabCompletes = 1;
+		wantsIndex = 1;
 	};
 	DA206CF0015C4D9F03C91932 = {
 		activeArgIndex = 2147483647;
@@ -1341,882 +890,35 @@
 		);
 		configStateDict = {
 		};
+		cppStopOnCatchEnabled = 0;
+		cppStopOnThrowEnabled = 0;
+		customDataFormattersEnabled = 1;
 		debuggerPlugin = ASKDebugger;
+		disassemblyDisplayState = 0;
 		dylibVariantSuffix = "";
 		enableDebugStr = 1;
 		environmentEntries = (
 		);
 		isa = PBXExecutable;
+		libgmallocEnabled = 0;
 		name = MacGPSBabel;
 		shlibInfoDictList = (
 		);
 		sourceDirectories = (
 		);
 	};
-	F505F8000617AE8001A80065 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 606";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1782;
-		vrLoc = 9262;
-	};
-	F505F8010617AE8001A80065 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 5";
-		rLen = 0;
-		rLoc = 209;
-		rType = 0;
-		vrLen = 281;
-		vrLoc = 0;
-	};
-	F505F8020617AE8001A80065 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 21";
-		rLen = 0;
-		rLoc = 1390;
-		rType = 0;
-		vrLen = 1390;
-		vrLoc = 0;
-	};
-	F508F40305A7AE8A01A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 480";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 2445;
-		vrLoc = 5977;
-	};
-	F508F40405A7AE8A01A80064 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 292;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F508F40505A7AE8A01A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F50EB4AF05CB231C017C67C1 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 5";
-		rLen = 0;
-		rLoc = 184;
-		rType = 0;
-		vrLen = 1163;
-		vrLoc = 0;
-	};
-	F51C069F05C4C5B4017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 564";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1497;
-		vrLoc = 0;
-	};
-	F51C06A005C4C5B4017C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 292;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F51C06A105C4C5B4017C67C1 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1157;
-		vrLoc = 0;
-	};
-	F51CF6B405AF9E8901A80064 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1157;
-		vrLoc = 0;
-	};
-	F523D7AD05CB3DB9017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 328";
-		rLen = 0;
-		rLoc = 17059;
-		rType = 0;
-		vrLen = 1498;
-		vrLoc = 0;
-	};
-	F523D7AE05CB3DB9017C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F52B871705A8A05001A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 480";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1744;
-		vrLoc = 189;
-	};
-	F52B871905A8A05001A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 190";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1958;
-		vrLoc = 8259;
-	};
-	F52B871B05A8A05001A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 188";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 2222;
-		vrLoc = 8371;
-	};
-	F52E6CB905995A8001A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 434";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1792;
-		vrLoc = 0;
-	};
-	F52E6CBA05995A8001A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F52E6CBB05995A8001A80064 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 304;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F52E6CBC05995A8001A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F52E6CBD05995A8001A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 434";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1792;
-		vrLoc = 0;
-	};
-	F52E6CBE05995A8001A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F53C482A061A912901A80065 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F53C482B061A912901A80065 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 426";
-		rLen = 0;
-		rLoc = 20376;
-		rType = 0;
-		vrLen = 2463;
-		vrLoc = 1202;
-	};
-	F54D1E350548BAC0017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 193";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1413;
-		vrLoc = 2970;
-	};
-	F54D1E360548BAC0017C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F54D1E370548BAC0017C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 304;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F5516AA205E1AD5A017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 7";
-		rLen = 0;
-		rLoc = 347;
-		rType = 0;
-		vrLen = 2046;
-		vrLoc = 0;
-	};
-	F5516AA305E1AD5A017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 4";
-		rLen = 0;
-		rLoc = 167;
-		rType = 0;
-		vrLen = 1799;
-		vrLoc = 0;
-	};
-	F5516AA405E1AD5A017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 5";
-		rLen = 143;
-		rLoc = 161;
-		rType = 0;
-		vrLen = 2103;
-		vrLoc = 0;
-	};
-	F5516AA505E1AD5A017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 3";
-		rLen = 0;
-		rLoc = 51;
-		rType = 0;
-		vrLen = 1931;
-		vrLoc = 0;
-	};
-	F5516AA605E1AD5A017C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 304;
-		rType = 0;
-		vrLen = 267;
-		vrLoc = 0;
-	};
-	F5516AA705E1AD5A017C67C1 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 4";
-		rLen = 0;
-		rLoc = 158;
-		rType = 0;
-		vrLen = 1125;
-		vrLoc = 0;
-	};
-	F5516AA805E1AD5A017C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 288;
-		rType = 0;
-		vrLen = 277;
-		vrLoc = 0;
-	};
-	F5516AA905E1AD5A017C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F5516AAA05E1AD5A017C67C1 = {
-		fRef = F508F3FF05A7A82F01A80064;
-		isa = PBXTextBookmark;
-		name = "Credits.rtf: 21";
-		rLen = 0;
-		rLoc = 1390;
-		rType = 0;
-		vrLen = 1390;
-		vrLoc = 0;
-	};
-	F5516AAB05E1AD5A017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 568";
-		rLen = 0;
-		rLoc = 27531;
-		rType = 0;
-		vrLen = 1904;
-		vrLoc = 23011;
-	};
-	F5516AAC05E1AD5A017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 12";
-		rLen = 0;
-		rLoc = 546;
-		rType = 0;
-		vrLen = 2103;
-		vrLoc = 0;
-	};
-	F554DF6805AE715801A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 499";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1552;
-		vrLoc = 0;
-	};
-	F554DF6905AE715801A80064 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 292;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F554DF6A05AE715801A80064 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F554DF6B05AE715801A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 499";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1552;
-		vrLoc = 0;
-	};
-	F557060805C8B0C0017C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F557060905C8B0C0017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 554";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1511;
-		vrLoc = 14316;
-	};
-	F557060A05C8B0C0017C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F557060B05C8B0C0017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 5";
-		rLen = 0;
-		rLoc = 167;
-		rType = 0;
-		vrLen = 1498;
-		vrLoc = 0;
-	};
-	F557060C05C8B0C0017C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 292;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F586ED0705CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 556";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1495;
-		vrLoc = 0;
-	};
-	F586ED0805CC1ED5017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 8";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 157;
-		vrLoc = 0;
-	};
-	F586ED0905CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 245";
-		rLen = 0;
-		rLoc = 13549;
-		rType = 0;
-		vrLen = 1811;
-		vrLoc = 11141;
-	};
-	F586ED0A05CC1ED5017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 11";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 459;
-		vrLoc = 0;
-	};
-	F586ED0B05CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 245";
-		rLen = 0;
-		rLoc = 13549;
-		rType = 0;
-		vrLen = 1795;
-		vrLoc = 11141;
-	};
-	F586ED0C05CC1ED5017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 26";
-		rLen = 0;
-		rLoc = 2428;
-		rType = 0;
-		vrLen = 1745;
-		vrLoc = 0;
-	};
-	F586ED0D05CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 245";
-		rLen = 0;
-		rLoc = 13549;
-		rType = 0;
-		vrLen = 1773;
-		vrLoc = 9896;
-	};
-	F586ED0E05CC1ED5017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 19";
-		rLen = 0;
-		rLoc = 1624;
-		rType = 0;
-		vrLen = 1970;
-		vrLoc = 0;
-	};
-	F586ED0F05CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 528";
-		rLen = 1109;
-		rLoc = 25826;
-		rType = 0;
-		vrLen = 2083;
-		vrLoc = 20945;
-	};
-	F586ED1005CC1ED5017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 59";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2167;
-		vrLoc = 616;
-	};
-	F586ED1105CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 543";
-		rLen = 543;
-		rLoc = 26936;
-		rType = 0;
-		vrLen = 2083;
-		vrLoc = 20945;
-	};
-	F586ED1205CC1ED5017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2426;
-		vrLoc = 370;
-	};
-	F586ED1305CC1ED5017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 557";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1436;
-		vrLoc = 21697;
-	};
-	F586ED1405CC1ED5017C67C1 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	F588B18805DF3294017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 564";
-		rLen = 161;
-		rLoc = 27532;
-		rType = 0;
-		vrLen = 1973;
-		vrLoc = 22760;
-	};
-	F58F331C05CF5079017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 0;
-	};
-	F58F331D05CF5079017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 577";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1728;
-		vrLoc = 16243;
-	};
-	F58F331E05CF5079017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 0;
-	};
-	F58F331F05CF5079017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 577";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1774;
-		vrLoc = 13079;
-	};
-	F58F332005CF5079017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 38";
-		rLen = 0;
-		rLoc = 2428;
-		rType = 0;
-		vrLen = 2277;
-		vrLoc = 1396;
-	};
-	F58F332105CF5079017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 32";
-		rLen = 14;
-		rLoc = 1279;
-		rType = 0;
-		vrLen = 2064;
-		vrLoc = 332;
-	};
-	F58F332205CF5079017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 53";
-		rLen = 0;
-		rLoc = 3626;
-		rType = 0;
-		vrLen = 2194;
-		vrLoc = 205;
-	};
-	F58F332305CF5079017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 318";
-		rLen = 0;
-		rLoc = 17059;
-		rType = 0;
-		vrLen = 1766;
-		vrLoc = 13015;
-	};
-	F58F332405CF5079017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 38";
-		rLen = 0;
-		rLoc = 2373;
-		rType = 0;
-		vrLen = 2024;
-		vrLoc = 1122;
-	};
-	F58F332505CF5079017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 41";
-		rLen = 0;
-		rLoc = 2932;
-		rType = 0;
-		vrLen = 1835;
-		vrLoc = 282;
-	};
-	F5CCE1EA05CCCE05017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 556";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1497;
-		vrLoc = 0;
-	};
-	F5CCE1EB05CCCE05017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2273;
-		vrLoc = 0;
-	};
-	F5D9F70F05CF63CD017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 144";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 1911;
-		vrLoc = 3995;
-	};
-	F5DC7AAE05D47E10017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 572";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 2257;
-		vrLoc = 782;
-	};
-	F5DC7AB305D49339017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 127";
-		rLen = 628;
-		rLoc = 5438;
-		rType = 0;
-		vrLen = 1702;
-		vrLoc = 2050;
-	};
-	F5DC7AB405D49339017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 572";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 2240;
-		vrLoc = 332;
-	};
-	F5DC7AB805D495EE017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 41";
-		rLen = 265;
-		rLoc = 1837;
-		rType = 0;
-		vrLen = 1967;
-		vrLoc = 372;
-	};
-	F5E2D67E05CDA550017C67C1 = {
-		fRef = F5E2D68A05CDA550017C67C1;
-		isa = PBXBookmark;
-	};
-	F5E2D67F05CDA550017C67C1 = {
-		fRef = F5E2D68B05CDA550017C67C1;
-		isa = PBXBookmark;
-	};
-	F5E2D68005CDA550017C67C1 = {
-		fRef = F5E2D68905CDA550017C67C1;
-		isa = PBXBookmark;
-	};
-	F5E2D68205CDA550017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 577";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 1728;
-		vrLoc = 16243;
-	};
-	F5E2D68305CDA550017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 6066;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 0;
-	};
-	F5E2D68405CDA550017C67C1 = {
-		fRef = F5E2D68805CDA550017C67C1;
-		isa = PBXBookmark;
-	};
-	F5E2D68505CDA550017C67C1 = {
-		fRef = F5E2D68C05CDA550017C67C1;
-		isa = PBXBookmark;
-	};
-	F5E2D68605CDA550017C67C1 = {
-		fRef = F5E2D68D05CDA550017C67C1;
-		isa = PBXBookmark;
-	};
-	F5E2D68805CDA550017C67C1 = {
-		isa = PBXFileReference;
-		name = index.html;
-		path = /Developer/Documentation/DeveloperTools/ProjectBuilder/ProjectBuilder.help/Contents/Resources/English.lproj/UsingHelp/index.html;
-		refType = 0;
-	};
-	F5E2D68905CDA550017C67C1 = {
-		isa = PBXFileReference;
-		name = index.html;
-		path = /Developer/Documentation/DeveloperTools/ProjectBuilder/ProjectBuilder.help/Contents/Resources/English.lproj/Frameworks/index.html;
-		refType = 0;
-	};
-	F5E2D68A05CDA550017C67C1 = {
-		isa = PBXFileReference;
-		name = index.html;
-		path = /Developer/Documentation/DeveloperTools/ProjectBuilder/ProjectBuilder.help/Contents/Resources/English.lproj/UsingHelp/index.html;
-		refType = 0;
-	};
-	F5E2D68B05CDA550017C67C1 = {
-		isa = PBXFileReference;
-		name = index.html;
-		path = /Developer/Documentation/DeveloperTools/ProjectBuilder/ProjectBuilder.help/Contents/Resources/English.lproj/Apps/index.html;
-		refType = 0;
-	};
-	F5E2D68C05CDA550017C67C1 = {
-		isa = PBXFileReference;
-		name = index.html;
-		path = /Developer/Documentation/DeveloperTools/ProjectBuilder/ProjectBuilder.help/Contents/Resources/English.lproj/Apps/index.html;
-		refType = 0;
-	};
-	F5E2D68D05CDA550017C67C1 = {
-		isa = PBXFileReference;
-		name = index.html;
-		path = /Developer/Documentation/DeveloperTools/ProjectBuilder/ProjectBuilder.help/Contents/Resources/English.lproj/Frameworks/index.html;
-		refType = 0;
-	};
-	F5E67E8505DFEBAB017C67C1 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 6";
-		rLen = 0;
-		rLoc = 292;
-		rType = 0;
-		vrLen = 275;
-		vrLoc = 0;
-	};
-	F5E67E8605DFEBAB017C67C1 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 562";
-		rLen = 0;
-		rLoc = 27479;
-		rType = 0;
-		vrLen = 1973;
-		vrLoc = 22760;
-	};
-	F5EAB15305FF78D401A80065 = {
-		fRef = F52E6CB4059959B801A80064;
-		isa = PBXBookmark;
-	};
-	F5EAB15505FF78D401A80065 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 518";
-		rLen = 0;
-		rLoc = 24691;
-		rType = 0;
-		vrLen = 1965;
-		vrLoc = 21930;
-	};
-	F5EAB15605FF78D401A80065 = {
-		fRef = F52E6CB4059959B801A80064;
-		isa = PBXBookmark;
-	};
-	F5F16EF80527D1B401A80064 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 111";
-		rLen = 0;
-		rLoc = 4628;
-		rType = 0;
-		vrLen = 1256;
-		vrLoc = 3068;
-	};
-	F5F2761005EDB91901A80065 = {
-		fRef = DA206CF3015C4E8B03C91932;
-		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 575";
-		rLen = 0;
-		rLoc = 28253;
-		rType = 0;
-		vrLen = 2154;
-		vrLoc = 21908;
+	DA206CF3015C4E8B03C91932 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1672, 9810}}";
+			sepNavSelRange = "{1155, 0}";
+			sepNavVisRect = "{{0, 150}, {1109, 616}}";
+		};
 	};
-	F5F411C805EEF803017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 101";
-		rLen = 0;
-		rLoc = 4270;
-		rType = 0;
-		vrLen = 1874;
-		vrLoc = 4192;
+	F586ED0005CB576C017C67C1 = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {983, 2250}}";
+			sepNavSelRange = "{1520, 0}";
+			sepNavVisRect = "{{0, 336}, {653, 184}}";
+		};
 	};
 }
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj
index d7d4e509f..931dfc457 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 38;
+	objectVersion = 39;
 	objects = {
 		080E96DCFE201CFB7F000001 = {
 			fileRef = 29B97318FDCFA39411CA2CEA;
@@ -19,6 +19,7 @@
 			isa = PBXGroup;
 			name = Scripts;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C165CFE840E0CC02AAC07 = {
 			children = (
@@ -28,13 +29,16 @@
 			isa = PBXVariantGroup;
 			name = InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C165DFE840E0CC02AAC07 = {
 			fileEncoding = 10;
 			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
 			name = English;
 			path = English.lproj/InfoPlist.strings;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		089C165EFE840E0CC02AAC07 = {
 			fileRef = 089C165CFE840E0CC02AAC07;
@@ -60,12 +64,15 @@
 			isa = PBXGroup;
 			name = "Linked Frameworks";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1058C7A1FEA54F0111CA2CBB = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = Cocoa.framework;
 			path = /System/Library/Frameworks/Cocoa.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		1058C7A2FEA54F0111CA2CBB = {
 			children = (
@@ -75,6 +82,7 @@
 			isa = PBXGroup;
 			name = "Other Frameworks";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		1058C7A3FEA54F0111CA2CBB = {
 			fileRef = 1058C7A1FEA54F0111CA2CBB;
@@ -93,9 +101,11 @@
 //173
 //174
 		17587328FF379C6511CA2CBB = {
-			isa = PBXApplicationReference;
+			explicitFileType = wrapper.application;
+			isa = PBXFileReference;
 			path = MacGPSBabel.app;
 			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 //170
 //171
@@ -114,6 +124,7 @@
 			isa = PBXGroup;
 			name = Products;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 //190
 //191
@@ -126,6 +137,8 @@
 //293
 //294
 		29B97313FDCFA39411CA2CEA = {
+			buildSettings = {
+			};
 			buildStyles = (
 				4A9504CCFFE6A4B311CA0CBA,
 				4A9504CDFFE6A4B311CA0CBA,
@@ -150,6 +163,7 @@
 			name = Application;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97315FDCFA39411CA2CEA = {
 			children = (
@@ -159,12 +173,15 @@
 			name = "Other Sources";
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97316FDCFA39411CA2CEA = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.objc;
 			path = main.m;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97317FDCFA39411CA2CEA = {
 			children = (
@@ -178,6 +195,7 @@
 			name = Resources;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97318FDCFA39411CA2CEA = {
 			children = (
@@ -187,12 +205,15 @@
 			name = MainMenu.nib;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97319FDCFA39411CA2CEA = {
 			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
 			name = English;
 			path = English.lproj/MainMenu.nib;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97323FDCFA39411CA2CEA = {
 			children = (
@@ -203,18 +224,23 @@
 			name = Frameworks;
 			path = "";
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		29B97324FDCFA39411CA2CEA = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = AppKit.framework;
 			path = /System/Library/Frameworks/AppKit.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		29B97325FDCFA39411CA2CEA = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = Foundation.framework;
 			path = /System/Library/Frameworks/Foundation.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		29B97326FDCFA39411CA2CEA = {
 			buildPhases = (
@@ -262,7 +288,7 @@
 	<key>CFBundleSignature</key>
 	<string>mGPS</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>
@@ -327,21 +353,24 @@
 //4A3
 //4A4
 		4A9504CCFFE6A4B311CA0CBA = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				OPTIMIZATION_CFLAGS = "-O0";
+				ZERO_LINK = YES;
 			};
 			isa = PBXBuildStyle;
 			name = Development;
 		};
 		4A9504CDFFE6A4B311CA0CBA = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				OTHER_OSAFLAGS = "-x";
+				ZERO_LINK = NO;
 			};
 			isa = PBXBuildStyle;
 			name = Deployment;
@@ -357,10 +386,12 @@
 //DA3
 //DA4
 		DA206CF1015C4E2903C91932 = {
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
 			name = AppleScriptKit.framework;
 			path = /System/Library/Frameworks/AppleScriptKit.framework;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		DA206CF2015C4E2903C91932 = {
 			fileRef = DA206CF1015C4E2903C91932;
@@ -371,14 +402,18 @@
 		DA206CF3015C4E8B03C91932 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.applescript;
 			path = MacGPSBabel.applescript;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		DA206CF4015C4E8B03C91932 = {
 			isa = PBXFileReference;
+			lastKnownFileType = archive.asdictionary;
 			name = AppleScriptKit.asdictionary;
 			path = /System/Library/Frameworks/AppleScriptKit.framework/Versions/A/Resources/AppleScriptKit.asdictionary;
 			refType = 0;
+			sourceTree = "<absolute>";
 		};
 		DA206CF5015C4E8B03C91932 = {
 			fileRef = DA206CF3015C4E8B03C91932;
@@ -412,13 +447,17 @@
 //F54
 		F508F3FF05A7A82F01A80064 = {
 			isa = PBXFileReference;
+			lastKnownFileType = text.rtf;
 			path = Credits.rtf;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F514A08D05A6164F01A80064 = {
-			isa = PBXExecutableFileReference;
+			isa = PBXFileReference;
+			lastKnownFileType = "compiled.mach-o.executable";
 			path = gpsbabel;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F514A08E05A6164F01A80064 = {
 			fileRef = F514A08D05A6164F01A80064;
@@ -428,8 +467,10 @@
 		};
 		F52E6CB4059959B801A80064 = {
 			isa = PBXFileReference;
+			lastKnownFileType = image.icns;
 			path = mgb.icns;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F52E6CB5059959B801A80064 = {
 			fileRef = F52E6CB4059959B801A80064;
@@ -440,8 +481,10 @@
 		F586ED0005CB576C017C67C1 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.applescript;
 			path = preferences.applescript;
 			refType = 4;
+			sourceTree = "<group>";
 		};
 		F586ED0105CB576C017C67C1 = {
 			fileRef = F586ED0005CB576C017C67C1;
diff --git a/gpsbabel/macgpsbabel/preferences.applescript b/gpsbabel/macgpsbabel/preferences.applescript
index 9b503bd98..2f7e62d58 100644
--- a/gpsbabel/macgpsbabel/preferences.applescript
+++ b/gpsbabel/macgpsbabel/preferences.applescript
@@ -14,27 +14,44 @@ property startState : false
 -- EVENT HANDLERS --
 
 on will finish launching theObject
-	
 	-- make empty entries in user defaults
 	make new default entry at end of default entries of user defaults with properties {name:"theInputType", contents:startIndex}
 	make new default entry at end of default entries of user defaults with properties {name:"theOutputType", contents:startIndex}
 	make new default entry at end of default entries of user defaults with properties {name:"gpsIN", contents:startState}
 	make new default entry at end of default entries of user defaults with properties {name:"gpsOUT", contents:startState}
 	make new default entry at end of default entries of user defaults with properties {name:"gpsReceiver", contents:startIndex}
-	
-	-- read current user defaults
-	my readSettings()
-	
-	-- deal with changes to MacGPSBabel window needed if any of the GPS check boxes are checked by default
-	if state of button "GPSswitchIN" of window "MacGPSBabel" is equal to 1 then
-		my gpsIN()
-	end if
-	if state of button "GPSswitchOUT" of window "MacGPSBabel" is equal to 1 then
-		my gpsOUT()
-	end if
 end will finish launching
 
+on awake from nib theObject
+	if theObject is window "MacGPSBabel" then
+		tell window "MacGPSBabel"
+			set popList to my getFormats()
+			repeat with i in popList
+				make new menu item at the end of menu items of menu of popup button "inPop" with properties {title:i, enabled:true}
+				make new menu item at the end of menu items of menu of popup button "outPop" with properties {title:i, enabled:true}
+			end repeat
+		end tell
+		
+		-- read current user defaults
+		my readSettings()
+		
+		-- deal with changes to MacGPSBabel window needed if any of the GPS check boxes are checked by default
+		if state of button "GPSswitchIN" of window "MacGPSBabel" is equal to 1 then
+			my gpsIN()
+		end if
+		if state of button "GPSswitchOUT" of window "MacGPSBabel" is equal to 1 then
+			my gpsOUT()
+		end if
+	end if
+end awake from nib
+
 on will open theObject
+	-- set the progress indicator style
+	if theObject is window "MacGPSBabel" then
+		set p to progress indicator 1 of theObject
+		call method "setStyle:" of p with parameter 1
+		call method "setDisplayedWhenStopped:" of p with parameters {false}
+	end if
 	if theObject is window "SelectGPS" then
 		-- get the list of available serial ports
 		set popList to my getSerial()
@@ -89,11 +106,13 @@ end clicked
 -- read user defaults
 on readSettings()
 	tell user defaults
-		set defaultInputIndex to contents of default entry "theInputType"
-		set defaultOutputIndex to contents of default entry "theOutputType"
+		set defaultInputIndex to contents of default entry "theInputType" as integer
+		set defaultOutputIndex to contents of default entry "theOutputType" as integer
 		set defaultgpsIN to contents of default entry "gpsIN" as boolean
 		set defaultgpsOUT to contents of default entry "gpsOUT" as boolean
 	end tell
+	-- call method "setObjectValue:" of object (popup button "inPop" of window "MacGPSBabel") with parameter defaultInputIndex
+	-- call method "synchronizeTitleAndSelectedItem" of object (popup button "inPop" of window "MacGPSBabel")
 	set contents of popup button "inPop" of window "MacGPSBabel" to defaultInputIndex
 	set contents of popup button "outPop" of window "MacGPSBabel" to defaultOutputIndex
 	set state of button "GPSswitchIN" of window "MacGPSBabel" to defaultgpsIN
@@ -141,4 +160,26 @@ on getSerial()
 	end repeat
 	set AppleScript's text item delimiters to defaultDelimiters
 	return myList
-end getSerial
\ No newline at end of file
+end getSerial
+
+-- handler (called at startup) to check with GPS Babel which file formats it can handle. Return the result as a list
+on getFormats()
+	set myList to {}
+	set typeList to {}
+	set extList to {}
+	set thePath to POSIX path of (path to me) as string
+	set scriptOut to (do shell script quoted form of thePath & "Contents/Resources/gpsbabel -^1") as string
+	set theCount to count of paragraphs in scriptOut
+	set defaultDelimiters to AppleScript's text item delimiters
+	set AppleScript's text item delimiters to tab
+	repeat with i from 1 to theCount
+		set theLine to paragraph i of scriptOut
+		if (first text item of theLine) is equal to "file" then
+			set the end of typeList to the second text item of theLine
+			set the end of extList to the third text item of theLine
+			set the end of myList to the last text item of theLine
+		end if
+	end repeat
+	set AppleScript's text item delimiters to defaultDelimiters
+	return myList
+end getFormats
\ No newline at end of file
-- 
2.30.2